Merge from emacs-24; up to r111123
authorGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 02:37:57 +0000 (18:37 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 02:37:57 +0000 (18:37 -0800)
commit718ac627c0895af2005a2c27bbb72a9d1e7cb0d4
tree0ecb79ff30aa0eddb9a8706d9f0c89151fed5998
parent0cd3e098119a037b7b666a531b340d633dadc899
parent3c1daedbdc8c8fd836b56cf63f49e5631b797e07
Merge from emacs-24; up to r111123
16 files changed:
configure.ac
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/man/emacs.1
doc/man/etags.1
doc/misc/wisent.texi
lisp/ChangeLog
lisp/calc/README
lisp/emacs-lisp/byte-run.el
lisp/net/tramp-sh.el
lisp/subr.el
msdos/sed2v2.inp
nt/config.nt
nt/emacs.rc
nt/emacsclient.rc
src/fns.c